First implementation

For review
should probably add that github comment as a source code comment