Added init functions to controllers to make them more readable
Merge conflict when pulling