Begin refactoring actions

Need to subclass action handlers