Relational structures
Fixed tests, all pass now