Did a bunch of stuff over the last month, but didn't commit!