Rework as per issue #3 - wip