There's a few TODOs scattered in the code - is there a plan to fix these up at some point?