Using navstate to determine if zombie
Merge branch 'stripe' into testing