Adding in some comments and changing class name to make more sense