Goal before save operations

fixes #2 PTAL @mhahn