big commit with last few weeks of work