Filled in more info and added TODO's