add in a few todos throughout