I may come back to try the new changes as well if they resolved most of the crashing issues.