Opps, that's kinda embarrassing. That TODO doesn't even belong there; I must of overlooked it :/