Improved animation framework. Captures now work.