added 7 TODOs