Finishes implementing tags