Its almost working