Working somewhat for now....To tweak later