Started adding javadoc style comments