Fixing MVC principles. Work pending