Prototype
Merge pull request #1 from Stud-Muffins/master

Prototype