Now have double-sided FMD-mediated mapping working and passing tests.