WIP: started isActive refactor
WIP: refactor omg isActive you are so powerful
WIP: refactor: cleanup