Getting it working

Changes to the hang on names