added TODO's
progress