ADD: Properties implementation and tests
MOD: fixed imports and indentation