gutting everything for new design, partially complete, syncing up with Armin for sync adapter