overhaul. cleaner coordinator and ability to close quickly.
Merge branch 'develop'