Revert "Revert "Initial addition""

This reverts commit ee9992125827d129137880c868b3f464de6ccfc1.