Jeff's changes + communication

-Adding Jeff's changes
-Communication now correctly setup