split out shell, added twist lock, rebuilt