Working on communications #211
Merge