Fix ID
Partially revert "concept animatable" changes

This should close out issue 42