- upgraded the PROPERTY macro, resulting in a major code refactor