Dev aff round2

https://trello.com/b/UoO9FUZR/affiliations-issues