Last commit before controller rework