unifiy things
less exceptions
fix tests
not working yet