Everything but payment working