Actually finished the prototype this time
Merge pull request #807 from jaypoulz/hamster

Actually finished the prototype this time