moved todo's around