A Stronger Planning Framework for a Changing Energy Market