Part testing
bla2
started new simpler implementation