Finished moving uncrashable out to a separate file
commenting out