Okay I'm getting too commit happy, I'll chill after this one. But! I moved the figures into the right parts of the outline.