Moved more stuff into try of Main.cpp