Starting to refactor into something more modular, still a ways to go. Need to decouple Navigator from PageController