Started writing some new javadoc