Huge amounts of new javadoc stuf