Normalizing Property behavior

Instead of having a mixture of Hashes and Property objects, attempting
to normalize to a Property object.