Work on splitting out functions.