Add state tracking
Correct IEntity decoration; start Update tests
Update to latest
Revert "Update to latest"

This reverts commit 55cd795f262450913cd7f083a279de3c746b1c91.