messy big commit to get things on track