Grady/reorder

Sorry! This is sloppy.