refractored all

pre-testing