continued refactoring of specs/features/code for Card