Started working on JavaDoc comments