marked update and change needs refactored so resolve share at resolve time not parse time