Changed MVC to be more user student friendly (less observing :\)