Implemented some todo stuff not tested yet