Ticked off a few todos