Substrate stuff
Added Server and Protocol