save/restore base now fully working