removed echo statements
added TODO