Add message variables and begin to implement messages