Added client/server dev code