Major re-work to concepts of wip - needs review