still working with commenting and javadocs