Add first draft of the new feature

This is the first attempt at merging a forked branch to master with a pull request