some changes
Merge branch 'master' into selectiondisplays
making sure i dont lose these changes
add'l changes
another change
fixes for merge
merge fix2