Need to redo the Java layers for CFDbTest 2.0 to see if I've got a valid fix or not