WIP on improved animation API.