moved ID header to outer div, also added TODO