[WIP] Attempt to change security token model to Payment.