Revert "Changes & final prep"

This reverts commit 564b862c2f70621f6bdee6bb099fe28b5498045c.