refactored and moar functionality...merge me up Scotty!
Merge pull request #1 from shaunjohn/shaun

refactored and moar functionality...merge me up Scotty!