Updated with functionality beyond simple messaging