Added animations, added shuttle