Push client instatiation to top command class