can the above also be templated?

otherwise, this PR has been visually inspected/reviewed top to bottom with no further remarks