not working, but some progress made