Mixed some things up, they're now in the correct order #9 (closed)
This will create a new commit in order to revert the existing changes.
