Initial checkin with some types