put almost working...kind of