Added TODO's and some generic defaults