Refactoring properties.  Much is broken.
Properties API
Renamed some classes
Options in progress
Merge branch 'master' into feature/refactor-properties
Converted to use new Options infrastructure.
Merge branch 'feature/refactor-properties'