Added a few TODOs for direction during my work tomorrow