Before splitting out stability functionality