Adding a couple of todo's