first checkin of Claus' code with a few modifications

No match.