Checking in JessiD branch
Merge branch 'JessiD'
Fixing dash back to normal
First ScottM branch