moved some stuff to test code
merge in changes