Added a few todo's so I can keep track