[DEV] Better shared pointer management (nearly work)