todo resolved
More unit tests, more documentation