More work on getting equipping and stowing ready for prime time, but not quite the yet. These changes breaks main, so pushing to branch.