Added crossfader functionality
Refactored a bit...