Initial work on update()