Trying to fix this merge issue going on

Pushing what might be some starting work on animations to be
overwritten.