More namespacing
Adding toggle function