Merge pull request #7 from viperchris3/work

Added a bunch of stuff
Merge pull request #8 from viperchris3/work

We have maps!