adding a bunch of todo's