Cleaned up
Now allows for saving without uploading image