New with tags.

Has a little flexibility to open up as bit more.