Merge pull request #1 from ScorchRaserik/master

SUPER BASIC PROTOTYPE