Rearranged priorities.

Elijah completed most of what was [28] already. Moved remainder to [24]