Added TODO's for future work
Merged conflict