added todo's and other stuff