added TODOs
added todos