Got toggle features working