Switch to a more direct path for adding/removing cards. WIP.