Closes #76 - Change jetons to switch control