Merge pull request #1 from mob/master

All the work we've done as a mob so far