Initial refactor to actions framework