inching towards a better model
working again.