Refactors to make initial new actions look better