Check off a bunch of old TODO stuff