[WIP] Home controller rework