progress commit

review only, do not merge