starting to write the javadoc
completing javadoc
merging the controller implementation