Filling some blanks... still very preliminary