added even more TODOs