Ugh. Still in progress, but a mess. Gonna try a different tack (branch: codyhouse2) to pull this off.