Most tests mostly pass.  I'm getting there