Added in some TODOs