Final commit before major refactor.