updated model structure. started on table viewer