I think we should have some javadocs here as well...