Moving to a more tightly aligned simulate and draw section for threading

Optimizing the simulate and draw components.