First impl. This has bugs. We need sleep.
Merge pull request #1 from danosborne/master

First impl. This has bugs. We need sleep.