Almost done with adding class outlines