oh dude holy crap, doing it with a decorator is brilliant. I'll leave this as-is now but yea that's awesome.