Major improvements. 95% done.