Fix of Main to Classes - Please Read Comment