Changed the way it picks up messages, still working things out