Slight progress on animation framework