Reworked some of the server/client stuff to allow for merging snapshots back onto remote/local devices.