Changed up types slightly to add a tag.
Modifications to make agreements between design and practice.