Everything almost working