fixed includes and added TODO statements