WIP: more javadoc