almost working
running now