Created by: bobheadxi
This change makes zapAdapter much simpler, and enables some more complex configuration.
Tests pass, indicating output is still as expected.