Second try.
Ok, now this is really the first commit. Still glurge, though.