bad habbits, days work
Merge pull request #1 from farfromguam/christopher

bad habbits, days work, need to do features!