Re-arrange plugin
Almost there