WIP almost have toggle working