More progress, now with tags.