changin uml
somwhate working
still working on types table