Added a couple TODO lines for a reminder