performance improvements
Now cards do not have a circular reference
Check in prior to attempt at major refactor
Mostly working after refactor
Save works in most cases