Changed TODO to hopefully make it clearer.