Start adding toggle logic and testing