Version .1
Merge pull request #1 from mikegazdag/version_1

Overhaul most code and update everything