Added a few more TODOs