Almost done bringing back all prior eventtap functionality.