Began refactor of scrambling effects