Rework: Third Pass

Add new tags.