Ordering changes.

This needs some refactoring...