getting close to finishing things
updates working okay