More work to get key frames working correctly