WIP build refactor