Feature/logan/27 sharing