Feature/add angular and service