Further code refactoring.  Lots of code has been commented out - this will be redone for Java 8 lambdas.