Moving everything to the main class