completes rewrite, prepped for MVC refactor