almost final
Merge remote-tracking branch 'origin/Miguels-DONT-CRASH' into master-8pm