More serpent setup work