There is no such thing as non-partisan in the government
Districts should be based on counties within a state, and candidates represent theur ONE county. No state is planning on adding and counties to my knowledge. And it would prevent gerrymandering.