some more tests most not working yet
some more changes