This seems to build on #39, is that correct?