Added missing april file; additional tweaks and refactoring to actions to reduce duplication of code.
Additional cleanup
Fix an issue with actions
additional tweaks