Added functionality

More checks (less data usage)
Initial support for user selected card