* wip
* Things are now becoming fun
* Cleaned things up a bit
* Moved things around
* Added some comments
* Sorted imports
* Cleaned things up
* Switched to google formatting
* Fixed some of the comments
* updated gitignore
* Use list comprehension
* Removed catTrace
* Fixed yet more comments