Intermediate checkin of uw2 edits