Added setup capability
Wrapping up but still no animation