Finished re-working EstatePropertyFactory