not everything passing, but getting there