updated source code from hacking event
updated to support json. still needs a bit of work
updated and tested. should work.
put in action.
Merge pull request #1 from harperreed/comprehensive

Made much more comprehensive