Updated todo comments with new ideas