Quick fix on cards return
Added in basic routing for types