Personal/thomas/quality

cc @asvirsky