Switch to use attributes rather than regex

derp