Ok, working well, still need to add in logic to remove issues