Almost there... Still problems with extra stuff coming back with update requests.