Now you're on the right track!

Those redundancies can be refactored as well, actually. (Definitely don't want duplicate info.)

I'll have a look-see today and see ...