refactoring complete, for now. cards consolidated and other consolidations.