Grady/reorder

Interesting Idea... I actually think that could work really well. That being said, should that be part of the refactor or part of this story?