Major changes for forward compatibility

[Anraza-Valtieri]

Alot of changes are made to accommodate flexable handling of different cards types such as favorites, single card and nearby.