Yay

WIP, so be nice.
I think a span tag would be better.