Added in a bunch of TODOs
merge