Client partially made object oriented, work in progress