improved registry, drafting new stack/layers