updated todo with solutions