added new resolvers for decks, cleaned up logic