Removing easing tests and adding in z-indexes