Renamed class to be a little more accomodating to its actions
Work in progress