Prep work for Angular routing.
Aborting Branch. Rebasing to master and starting this work over.