Working
More work on javadoc
Working