Change of plans...keeping some things at staging/public to test easier