This is the way. I have been working on similar.

Since code is cheap there is no excuse to not have verification everywhere.