added TODOs, tryna get this thing to run