Shuffled around one more time. I'm trying to find the right order.
Moved some subsections around into the correct sections.