Additional features are now alternatives. Closes #38

same here