In the middle of huge changes

See errors for adding new Classes propert