Hybrid electric/diesel