Feature/logan/31 place holder