Inserted a bunch of javadoc