Update Latest working change <95% functional>

Still need to adjust the google map credential, paypal credential.