Actual checkin of the source

Here is a better checkin