Henry, an idea for you: Do you think it might be possible to do a "long shaft" mast and deeper mast socket so that even if a mast isn't glued in it's likely to stay put and vertical unless deliberately removed? Since I don't rig my ships, I'm thinking of a combination of "battle damage" options and knockdown for ease of transport in my current storage system.