Have to change from map to real data base tables, planned tommorow