New regex
Add basic functionality