Redid entire Thing-O
Added a few validations
Fixed merge
Merge pull request #5 from fox-squirrels-2013/fixed_merge

Fixed merge