UPDATE: Implemented missing Controllers and reformated code