Added TODO's to keep track of development progress