cart doesnt crash and carries correct info yay
Messing with stuffs
Dismiss modal
Fixed some things with bicycle
merge conflict resolved
made pop changes