Modularizes comm. Adds various messages required for comm.
cleans up Ellis' code. Untabify and extra whitespace