Working version ... but no icon updating and lots of crud still present from prior test versions

Signed-off-by: Graham Chiu <compkarori@gmail.com>