added some TODOs on future features