new version with a cleaner data model but still without card design