First part of the project not using files anymore