Some channges towards #102. Questions outstanding to be resolved before this is closed.