Closer. Not done. Nightly commit. Maybe I can get more done tomorrow.