updated most objects, to the new structure. Still untested, and some methods doesn't have any logic yet. but getting close