Refactor Animation Protocol

WORK IN PROGRESS