Refactoring to use promises for model save/fetch