intermediate commit; moving to pivot/confirm, needs cleanup