Javadoc'd and commented