added Scanner
Updates to save and load