inserted TODOs and inserted placeholders for still missing parts