Proj/build

Looks like the Re-pull removed the extra commit, now that it has been committed. Any more of this and I'll be committed soon.