Buggy interface after creating included cards+solution

We need to make it so that when you click "add X" to add a new card, the card is not actually created until it is saved (current it's created immediately).  If the card already exists (because of simultaneous creations or back button issues or whatever), the card should render edit mode.