Began to write the new classes