We have this nice function to do all the work, and we're not even using it...

Signed-off-by: Michael Eshom <oldiesmann@oldiesmann.us>