cardi up refix (v1)

made this in 24 hours... first installment, first version