Toying with fades

Leaving commented out due to performance issues