Sigh
Merge
Bad
Add message recieve with new api