much refactoring
cleaned up card moving