Added regex values and first attempt at and or operators