Added some TODOs for reference later