broken commit, need to address issue of tapping bars vs pressing button and when/where to change state