Proj/build

hopefully this one is ok now. BH! Should be 2 commits.