a little more structure to the location of thing, seems useful now