added a few todo's