Added java files from 9/18