Update: Collision almost working...but not quite