work from this afternoon (see commits below)