Add more turn logic