making some progress on this