Merge pull request #3 from davesnowdon/master

query all properties
cleaning up
part way through query all properties implementation