WIP:lots of experimenting

Rhys Green requested to merge trying_to_fix_M_problem into master Jun 24, 2021