Add toggle functionality, Closes #54