Nightly checkin

(it compiles, at least)