ACF compat changes.  Everything is working except for positional arguments.  Need to do some more testing.
left some debugging in the tests.