Iteration G complete, moved payment_types into separate table