[m] Made some progress since last time (still have a lot more progress to make), what do you think?