Feature/logan/initial architecture