Split out Harwin M40 and move some code into drawing aids