New messaging base with better thread safety. A few red tests left