Compiles, but need testing
Merge pull request #9 from xLeachimx/getting_it_to_run

Compiles, but need testing