Nick/jeff squash fixedup

This is the squashed-into-1 PR form of Jeff's capa and other features. This PR is placeholder for now.