Added a few TODOs so I'd know what's next