added TODO's for memory management