intermittent commit number oh god why
this is incomplete, fuck
conflicts fixed