almost working -- update and save still need work