[WIP] Controllers and routes v2