Revert to counting windows

This reverts commit 1eb4f4fd3175d0880fc59c027872f94fb7a47f20.
Implement the toggling

Closes #1.