add TODOs for testing and delete auto generated comments