Can't get reorder functions to work properly

The logic is there if someone wants to take a crack at it, I probably screwed up syntax somewhere is all.
Merge remote-tracking branch 'origin/heroque' into unstable
[Inventory Example] Jacob this is roughly what I was suggesting. Would make the end product easier to comeplete.

A few fixes/changes