Add spigot and stuff