Did some more work on castling