WIP update functionality 70%