Updated TODO - pls read additions