Moved saving flow back to basic flow away from events

Signed-off-by: Chris Duell <me@chrisduell.com>