classes finished, needs javadocing
javadoced
Unit tests complete, various style fixes