End of major refactors. All app features appear to be running