318 rebuild/upgrade

Sounds very well thought out 66...