A little bit more.
Need to code some basic tests on one more interface.
...