Some stuff

Lunch work on my controllers