Refactored CastlesDug