A couple of TODOs added