some progress but arugh