Hoping to simplify the logic by moving the boilerplate into functions…

…. Also, implementing my TODO as a compile-time option. Primarily pushing now so that I can pull this into my testing infrastructure.