Reverted to inline associator, eschewing modal implementation
Merge branch 'dev' of github.com:deepwinter/lattice into dev