New command, #names and some tidying