finish regex and add OOP part