Updated TODO
Updated dispatcher/client