WIP for test completion
Emergency feature freeze to get it out to people.