Partial checkin.. sorry it\'s master. :-(