Adding client/server seperation