WIP: start refactoring how actions are scheduled