Feature/new feature

Awesome comment to be written some day...