Rt 1241

I think we can close that one, barring any design mistakes I made.

rob