more changes, working on cards part