Merging Robert's changes in to main branch

Such conflicts. Much command line.