Marching towards zero build errors. Not quite there yet.