Feature/ellis why crash

Michael Ellis requested to merge feature/ellis_whyCrash into master Jul 23, 2020