Encapsulate code in script into subroutines
... making sure that make and make test continued to pass
continued...