some more in progress commits