J48 in progress, deleted some TODO tags in other classes.