Added a todo as recommended during code review to make future work easier.