changed some things in the cascade, moved some classes around