A few changes, trying to get requestAnimationFrame to work