Re-factor to make tree go routine safe and correct my wind muddled mistakes