add Messages back into controller