new java classes
Merge https://github.com/borgmatthew/CPS3222