Msmb3 rebase2

Moved each category of change into a different commit that can be freely reordered by future rebases. The idea is all subsequent changes to each "part" (=commit listed here) can eventually be merged into one commit allowing an easy view of what has changed for each part