Interm commit for the night.