Feature/dev ph1