redid some classes to make sense with the new clone kill