Start working on #6, added unit test