Hello , We have some of the same issues here. What we did was teach basic Electrical and the Engine block both diesel and gas blocks in level 1. The second year was separated as far as diesel and automotive. It was a big problem for us and student success sinc... Login to read more.