starting integration of the client into main