messaging now uses a server
refactoring