Work on update--almost there