starting to reorganize code using MVC from q-wiki