Save step moved to model
New TODO