Progress but the reg expressions are being mean...