[WIP] Controllers

Don't merge yet please