Added a few todos