Reimplement old check code I was testing before

I would like to credit @wchen-r7 for providing advice and feedback.

@jvazquez-r7, too! :)