Refactored to use 2013 Java.
Started refactoring... everything.