Name entry dialog works
Merged, maybe