Move all save logic into single method, also save thumbnail