big commit of last few weeks' work

cause I'm bad at git