WIP - registry changes, fix export