added TODO; some documentation