Unfinished - Updates to MVC separation; Changed configuration to a properties file