Added TODOs, then I had BSOD.. Added less pretty TODOs