More work on copypaste

Regex next yayyyyy