All main classes added; methods not in proper places