Copied nosscire's pull of minThrust support

I think I've managed to sort out the mess I made of my branch this time...