This looks really good, thanks! Nice support for isometry.