woopps refractored 1 to deep
sheesh manual clean up