made lots of changes to violet hall class