Updated Regex

Scrap is a placeholder for code that I know I will need later