Some little progress on saving state