round #1 of moving to static locations: not yet dropped relation with locations table