Added Tasks and Updated Javadoc

Todo: Everything as in previous change.