Initial work
Fix relations