+ just add tests and some code