Pulling in changes from aaron for speeding it up.
Everything is happening all at once!
Merge