working through cart issues
fixed git issues