made some good progress here