moved all actions into class