Some refactoring to remove unneeded convoultion with location vs peice look up. ON and TR ahve working tests