deleted var_dump and added some TODO comments