Animation stuff added -- not yet tested/debugged