Intermediate commit for continued work tomorrow.