[@EncodedError] Will review! I'll be adding map claims tomorrow