More ugly ass implementation, if only i had more time
Merge branch 'master' of https://github.com/Hammertime38/Hackathon1_29_13