Reverted some of the work - ill-conceived implementation.