Week of text.

not using iso
Updated messaging.

was using the wrong class before