Moved save logic to form object