Added todos for future work