Added javadoc to class and marked @TODO for implementation