Done, also added a couple of basic unit tests.