Trying to add saving capabilities. Almost there...