WIP prior to shared_from_this change