Pre AI-bodge check-in

Twiddling submitted before I mangle the AI again.