Made a bunch of TODOs

temi and ryan, do your todos!