Shuffled some things around and completed 7-9