Moving properties into core class object.  Rewriting implementation.  Trying to add some features.