Made some progress but still not working