Changes in the trouble branch
Maineline work
Completed merge of trouble, fixing conflicts along the way