changed things, secont ot last commit for tonight
trying to fix merge conflicts