New classes added. Old classes updated. New functionality. Javadoc comments added.