first commit on new base for rigtypes