WIP cleaning up rebase to current, esp capa_base.py