Added JavaDocs
Updated TODO