Updated some things trying to get the Main to work