Remove unecesary (and confusing) variable
Initial work on comms