Messages functionality works, needs improvement