This could be resolved by next year...