More more TODOs and comments