Did some overal changes, started implementing some actual MVC