added links, improved structure and relationships, got tests green