Added some TODOs 

These TODOs must be processed before doing anything else