Closure warnings - NOT READY YET

....work in progress...