Kazoo 543

This should be the last of the ACDc changes needed to fulfill contract requirements.