Its mostly working now