Got id resolving working, after a fashion