Spigot Submodules #2