about to tear everything up and fix thiS