Breathing new life into this project ... see previous commit message