added TODOs for tomorrow morning