Moar comments/javadoc
Moar javadoc