Added some TODOs for device