Merge pull request from purpose-fixathon/first_features feat: first features