Progress to the point of building
Merge pull request #1 from timothysc/master

Progress to the point of building