Just cleaning up "Castling" logic, before the big push to get this all done