Completed commenting and moved save to its own method