Build overhaul (WIP)