Minor changes to chat
Added regex classes and test