Restructuring. Can connect master to slave now