Moved goal loading and saving to a service