Updated todo with latest developments