Custom properties implemented. Testing to unify.