Refactors to use current_time
Adds end current action
Refactors for all known action save cases