Added a couple more TODOs