Added TODO's and some doc