I'm submitting this because Jordan was unable to. We encountered a merge error.