Work so far on Feature #596