Rewrite - Phase 1 *Incomplete*

This is a major checkpoint in our rewrite