simple locator rewrite

planning to do more with this, but for now, just trying to abstract the locator into it's own little "shield" library
Line is too long. [146/80]