added TODOs for re-factoring
added TODOs for re-factoring