Old, uncommited work on differences between systems (eg, dev1/2)
Finishing last commit...