Finish Reader on TODO