Association refactor dan

Implement includes according @DanOlson, using the associations as @eloyesp propose.