27 aug feature
another attempt at having this do the right thing