Made progress on regex