Adam branch

javadocs ready to be added