fixing my controllers so all my commits, that aren't relevant are included.