working on commenting and javadoc