Big push to OOP. Scopes work, but there are bugs, esp. in saving and
cloning.