started rewrite for toggle button listener & model, see #57