(I'm going through the whole patch, breaking it up in bits and "cleaning" it up to make things a bit less invasive & more consistent)