Added JavaDoc tags, more to come