working on the ui
merge
started commenting
merging
working on comments and javadoc