Yeay, almost working