changed to properties, improved a lot the object side - still a lot of work to do