modify error handling. Allow for legacy upgrade site object. Get all the data