updated todo's and requirements