Feature/initial development