Client messages in new file for clarity. Fixed client regex