Massive refactor, clean up, new actions.