Some work on switching the trusted and untrusted server over to messages.Untested but compiles.