Redoing the on/off
Adding more tests
Adding todos - With more thoughts