mainline work
More work, on machine #2
Mainline work
Completed merge of trouble, fixing conflicts along the way
fixed conflit