WIP commit to switch to keyframes