Cleaned up solution and character class additions