Updated Animation queue

Turn the animation queue into an object rather than a boolean. This
makes it much more flexible