some cleanup around class, added a @wip scenario and feature