This needs testing now that #26 is merged.