Added association searching

Main code rev. 1743