WIP: Rework build process