DAR-1711 | Lazy rail - updated TODOs