Many, many changes. So much for micro-commits