Improvements on the local endpoint + begining of zstore logic
Fixed merge conflict