@b-lundgren Please review this, feedback appreciated. :)