client side changes to use serialNumber instead of guid
server side work in progress
server side guid - serialNumber work in progress