 		
 		for (mode, props) in propsByMode {
 			propOrder.removeAll()
-			
-//			// add existing transform props if not .zero
-//			if mode == .From {
-//				if let scale = tweenObject.scale {
-//					if !scaleFrom {
-//						from.scale = scale
-//					}
-//					if !scaleTo {
-//						to.scale = scale
-//					}
-//				}
-//				if let rotation = tweenObject.rotation {
-//					if !rotateFrom {
-//						from.rotation = rotation
-//					}
-//					if !rotateTo {
-//						to.rotation = rotation
-//					}
-//				}
-//				if let translation = tweenObject.translation {
-//					if !translateFrom {
-//						from.translation = translation
-//					}
-//					if !translateTo {
-//						to.translation = translation
-//					}
-//				}
-//			}
 			
 			for prop in props {
 				switch prop {

		}
		if !propOrder.contains(Translation.key) {
			t = CATransform3DTranslate(t, value.translation.x, value.translation.y, 0)
		}
		
		// make sure transforms are combined in the order in which they're specified for the tween

	
	private func transformValue(value: Transform) -> CATransform3D {
		var t = CATransform3DIdentity
		var removeTranslationForRotate = false
		
		// apply any existing transforms that aren't specified in this tween
		if !propOrder.contains(Scale.key) {
