Added some javadoc and a TODO