very satisfying delete of old code
forgot some implementation
improved locator stuff slightly or made it worse