I proposed in this post the idea of a TOS-era dedicated tender for shuttlecraft and a repair ship for incapacitated starships far from home. Here is a very preliminary design (with kudos to Klondike307 for the initial layout.) tender picture 1 tender picture 2 green- enclosed dock cyan- shuttle hangar and repair blue- workbee hangar purple- repair shops and parts storage/manufacture gray- extendable airlocks gold- crew and guest facillities (quarters, mess, temp berthing, etc.) orange- engineering, ship support services FYI warp nacelles are Connie-class size just to give everyone a sense of scale.