Initial commit for branch 'property'
Merge branch 'function' into property
Intial implementation of properties.