Toggles seem to be behaving properly, now all the is left is code clean
up