Basic support for one-to-one relationships
Removed ordering, broke all but trivial examples