going on with MVC refactoring...