Feature/add life