New features

Big refactor on associations and some new finder features.