some commits, in progress