Some cleanup, and added Communicator as a means of sending data easier.