[WIP] Initial work for trying to get keyed registrations working