Merge pull request #4 from ConnerHAnderson/conner

Cleaned up
Crappy