Adds tagging foundation. Refactors sibling stuff... again.