In-progress revised build system