not sure where i left off on this, so commiting before doing any further work