Almost working, saving changes