Added initial work around thng properties. Work in progress.