Initial work on Properties collector