Refactoring, bug fixing
Add all the listeners
Don't add this crap to the library
Start of the JSONReporter, and other updates