Did a bunch of TODO things.