Fixed basic token merging.
Basic networking stuff.