Fergs test branch

Merging property changes into master. Pull me off.