Started to outline methods
Starting integration with new code and initialization of client state (finally)