changes in the trouble branch
mainline work
completed merge of trouble, fixing conflicts