Finished first version
Merge pull request #1 from joecollins/first-attempt

Finished first version