Construct the solution
Merge pull request #1 from soloman817/master

Construct the solution, as a start.