yes. Did not have time to add unit tests, will do later.