Added sinusoidal generators based on shapes
Tweaked how dots move - needs interpolation