Moved around core data saving stuff into profile class