made some progress here