Resource working better, still not right though I think