working on properties
adding in support for properties