First round of clean up.
Blocker working again with 2D improvements.
Binary changes