Extracted out Log and a lot more fiddling.