Map is displaying, tables upgraded

This is usable now. Issues - Map crashes if table is empty. Must be
fixed