Checkin of new code

Resolve issues with the old 6.6p1 tree by starting anew