Round 1 scaffolding done + some cleanup along the way