Added TODOs comments
Added TODOs from guy shakhar's comment on OSM forum