Message Controller almost done