Adding some comments on where we are overriding properties. We must fix this. DO NOT OVERRIDE PROPERTIES