Initial checkin of 0.6