Still working away on this when I get a free moment, should be...