Ok almost working sorta