Hook up to real data via API.
Minor tweak to data layout.