in progress: updating the fade logic

something is kind of busted because it flickers a bit