There is certainly too many non electrified to just be covered by thumpers, any way why do you need something that can run on electrified and non electrified when there is no electrified lines for miles. for example wales thats where the 117s step in.