added some TODOs that needs to be done in the future