Added relationships. Still WIP though...