Starting to add err contexts