Begin work on splitting out into templates