On off switch

Joe, can you merge the branches?