ORKI-1016: Guadalupe

Owned by thiccs