moving towards MVC but not until code is consolidated some more.