Refactoring to be more like the MVC-Pattern. Updated permissions and
features.