Little work on the active output... still more to go to make it more consistent