Refactor features to be in one call. Fixes #5