Replace mutation with relational override
Make some things properties