Craig - card deets and js
Craig - merge