Restart the rebuild

Where I started and left off with porting heads.
273 302 318 340 build