Objects are defined with: { }
Various updates to use simpler design.