Checking in from ScottM branch
Adding things from JessiD to ScottM
Merge branch 'JessiD'
Fixing dash back to normal
Checkin from JessiD