I think i'll stick to ORM master for now and get that working. Once that's working I can see what's missing in your branch.