Initial checkin for 06

Working version of 06.