More work converting serpent to new system