moved messages into own file