~ added some TODOs